TBB: delete deprecated plat_match_rotpk()

The authentication framework deprecates plat_match_rotpk()
in favour of plat_get_rotpk_info(). This patch removes
plat_match_rotpk() from the platform port.

Change-Id: I2250463923d3ef15496f9c39678b01ee4b33883b

diff --git a/docs/porting-guide.md b/docs/porting-guide.md
index d0096054b0d8935923e8e5ae94f4d6fd2c22f1e6..2f01353557db14c13fcf590ffa5350fd5935210a 100644 (file)
--- a/docs/porting-guide.md
+++ b/docs/porting-guide.md
@@ -472,17 +472,6 @@ The ARM FVP port uses this function to initialize the mailbox memory used for
 providing the warm-boot entry-point addresses.
 
 
-### Function: plat_match_rotpk()
-
-    Argument : const unsigned char *, unsigned int
-    Return   : int
-
-This function is mandatory when Trusted Board Boot is enabled. It receives a
-pointer to a buffer containing a signing key and its size as parameters and
-returns 0 (success) if that key matches the ROT (Root Of Trust) key stored in
-the platform. Any other return value means a mismatch.
-
-
 ### Function: plat_get_rotpk_info()
 
     Argument : void *, void **, unsigned int *, unsigned int *

diff --git a/include/plat/common/platform.h b/include/plat/common/platform.h
index d8fa8916797f4776cf1b3e2041fcf267979bf21f..469d46b678cd9f7470b71df5615962798159bd17 100644 (file)
--- a/include/plat/common/platform.h
+++ b/include/plat/common/platform.h
@@ -198,7 +198,6 @@ void bl32_plat_enable_mmu(uint32_t flags);
 /*******************************************************************************
  * Trusted Board Boot functions
  ******************************************************************************/
-int plat_match_rotpk(const unsigned char *, unsigned int);
 int plat_get_rotpk_info(void *cookie, void **key_ptr, unsigned int *key_len,
                        unsigned int *flags);
 

diff --git a/plat/arm/board/common/board_arm_trusted_boot.c b/plat/arm/board/common/board_arm_trusted_boot.c
index 50379be4778083a689d57c6da4c346e967f52faa..103aafbf5082cc97edecdedcb2d0db544dab7740 100644 (file)
--- a/plat/arm/board/common/board_arm_trusted_boot.c
+++ b/plat/arm/board/common/board_arm_trusted_boot.c
@@ -62,17 +62,6 @@ static const unsigned char arm_devel_rotpk_hash[] =  \
                "\x8B\x4A\x4A\x46\xD8\x22\x9A\xDA";
 #endif
 
-/*
- * Check the validity of the key
- *
- * 0 = success, Otherwise = error
- */
-int plat_match_rotpk(const unsigned char *key_buf, unsigned int key_len)
-{
-       /* TODO: check against the ROT key stored in the platform */
-       return 0;
-}
-
 /*
  * Return the ROTPK hash in the following ASN.1 structure in DER format:
  *